From 27966b81010f96a4031c6f696f155a693d69dd60 Mon Sep 17 00:00:00 2001 From: Kelvin White Date: Thu, 19 Jun 2014 13:22:31 -0400 Subject: [PATCH] Update comments in erc-format-@nick to reflect changes in last merge. --- lisp/erc/erc.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 987c141d1ef..8d2ea62b231 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -4243,10 +4243,11 @@ See also `erc-format-nick-function'." (t "")))) (defun erc-format-@nick (&optional user channel-data) - "Format the nickname of USER showing if USER is an operator or has voice. -Operators have \"@\" and users with voice have \"+\" as a prefix. -Use CHANNEL-DATA to determine op and voice status. -See also `erc-format-nick-function'." + "Format the nickname of USER showing if USER has a voice, is an +operator, half-op, admin or owner. Owners have \"~\", admins have +\"&\", operators have \"@\" and users with voice have \"+\" as a +prefix. Use CHANNEL-DATA to determine op and voice status. See +also `erc-format-nick-function'." (when user (let ((nick (erc-server-user-nickname user))) (concat (erc-propertize -- 2.30.2